Use a define for the default icon theme name

We're using this name in two places, so match what we are doing
for the default theme name, and use a macro.

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index c0dbff885af1ea3586dc0ed4a26659108d3a57bc..bf69dd891c675bf491309fe675578fa89ca09f33 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -44,7 +44,7 @@
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "deprecated/gtknumerableiconprivate.h"
-#include "gtksettings.h"
+#include "gtksettingsprivate.h"
 #include "gtkprivate.h"
 
 #undef GDK_DEPRECATED
@@ -1348,7 +1348,7 @@ load_themes (GtkIconTheme *icon_theme)
    * and gnome is a pragmatic solution to prevent missing icons in
    * GTK+ applications when run under, e.g. KDE.
    */
-  insert_theme (icon_theme, "Adwaita");
+  insert_theme (icon_theme, DEFAULT_ICON_THEME);
   insert_theme (icon_theme, "gnome");
   insert_theme (icon_theme, FALLBACK_ICON_THEME);
   priv->themes = g_list_reverse (priv->themes);

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 361334a2db6522a8537d01d1fb22e8c66c3fcc66..7804ae071b70ca03c5803df4a024a85a5f2ea19c 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -449,7 +449,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                              g_param_spec_string ("gtk-icon-theme-name",
                                                                   P_("Icon Theme Name"),
                                                                   P_("Name of icon theme to use"),
-                                                                  "Adwaita",
+                                                                  DEFAULT_ICON_THEME,
                                                                   GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ICON_THEME_NAME);

diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h
index 71ba4a85e4ab3bb4aa691bfafe5c29350cd448be..d44e72241854a6bd834ec8a8757aebc7aaf8be87 100644 (file)
--- a/gtk/gtksettingsprivate.h
+++ b/gtk/gtksettingsprivate.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define DEFAULT_THEME_NAME      "Adwaita"
+#define DEFAULT_ICON_THEME      "Adwaita"
 
 void                _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
                                                               const gchar            *name,